OSDN Git Service

am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug...
authorRicardo Cervera <rcervera@google.com>
Fri, 16 Jan 2015 17:21:32 +0000 (17:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Jan 2015 17:21:32 +0000 (17:21 +0000)
commite8f6bd484627e16fa2fd9509b0f06056ee44be94
treed4397eb90b2da9532f3a3810caea2ecb617c5403
parentbb600de6e7c5c7a0a1d4b872d2ee100ccc353213
parent98f07d901492335f51258655fbfa032fa3f2d58e
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256

* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
core/java/android/app/Activity.java
core/java/android/content/Intent.java
docs/html/guide/topics/manifest/activity-element.jd