[android-tools/f17: 2/2] Fix merge

[Ivan Afonichev]

commit 42cec49fe4fd14f9bb28c538f1cab2659843e356
Merge: 030471b 3ae268d
Author: Ivan Afonichev <ivan.afonichev at gmail.com>
Date:   Thu May 10 02:02:52 2012 +0400

    Fix merge

 51-android.rules   |   90 ++++++++++++++++++++++++++++++----------------------
 android-tools.spec |   13 +++++--
 sources            |    2 +-
 3 files changed, 62 insertions(+), 43 deletions(-)
---
diff --cc android-tools.spec
index b4185bd,7f64d70..36d9e16
--- a/android-tools.spec
+++ b/android-tools.spec
@@@ -75,9 -75,11 +75,14 @@@ make install DESTDIR=$RPM_BUILD_ROOT BI
  
  
  %changelog
+ * Thu May 10 2012 Ivan Afonichev <ivan.afonichev at gmail.com> - 20120510gitd98c87c-1
+ - Update to upstream git commit d98c87c
+ - Added more udev devices
+ - Resolves: rhbz 819292 secure udev permissions
+ 
 +* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20111220git1b251bd-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
  * Tue Dec 20 2011 Ivan Afonichev <ivan.afonichev at gmail.com> - 20111220git1b251bd-1
  - Update to upstream git commit 1b251bd